From 733b9c524dbc2bec318bfc3588ed1652455d30ec Mon Sep 17 00:00:00 2001 From: Roger Pau Monne Date: Wed, 13 Mar 2013 17:42:17 +0000 Subject: [PATCH] xl: add vif.default.script MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Replace vifscript with vif.default.script. The old config option is kept for backwards compatibility. Signed-off-by: Roger Pau Monné Cc: George Dunlap Cc: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- docs/man/xl.conf.pod.5 | 4 +++- tools/libxl/xl.c | 11 ++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/docs/man/xl.conf.pod.5 b/docs/man/xl.conf.pod.5 index 31aebcaa90..7b9fcac2fa 100644 --- a/docs/man/xl.conf.pod.5 +++ b/docs/man/xl.conf.pod.5 @@ -70,10 +70,12 @@ operations (primarily domain creation). Default: C -=item B +=item B Configures the default hotplug script used by virtual network devices. +The old B option is deprecated and should not be used. + Default: C =item B diff --git a/tools/libxl/xl.c b/tools/libxl/xl.c index 9f45e4559f..4c598dbbad 100644 --- a/tools/libxl/xl.c +++ b/tools/libxl/xl.c @@ -96,8 +96,17 @@ static void parse_global_config(const char *configfile, * different device kinds. */ - if (!xlu_cfg_get_string (config, "vifscript", &buf, 0)) + if (!xlu_cfg_get_string (config, "vifscript", &buf, 0)) { + fprintf(stderr, "the global config option vifscript is deprecated, " + "please switch to vif.default.script\n"); + free(default_vifscript); default_vifscript = strdup(buf); + } + + if (!xlu_cfg_get_string (config, "vif.default.script", &buf, 0)) { + free(default_vifscript); + default_vifscript = strdup(buf); + } if (!xlu_cfg_get_string (config, "defaultbridge", &buf, 0)) { fprintf(stderr, "the global config option defaultbridge is deprecated, " -- 2.30.2